Merge "Add more test cases to OldChangesListTest"